diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistry.H b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
index 48cabcc1cf..14306e41fb 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistry.H
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistry.H
@@ -157,7 +157,7 @@ public:
 
             //- Lookup and return all objects of the given Type
             template<class Type>
-            HashTable<const Type*> lookupClass() const;
+            HashTable<const Type*> lookupClass(const bool strict = false) const;
 
             //- Is the named Type found?
             template<class Type>
diff --git a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
index eb7b8fab63..922d630de7 100644
--- a/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
+++ b/src/OpenFOAM/db/objectRegistry/objectRegistryTemplates.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,8 +29,7 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::wordList
-Foam::objectRegistry::names() const
+Foam::wordList Foam::objectRegistry::names() const
 {
     wordList objectNames(size());
 
@@ -50,14 +49,24 @@ Foam::objectRegistry::names() const
 
 
 template<class Type>
-Foam::HashTable<const Type*>
-Foam::objectRegistry::lookupClass() const
+Foam::HashTable<const Type*> Foam::objectRegistry::lookupClass
+(
+    const bool strict
+) const
 {
     HashTable<const Type*> objectsOfClass(size());
 
     for (const_iterator iter = begin(); iter != end(); ++iter)
     {
-        if (isA<Type>(*iter()))
+        if (strict && isType<Type>(*iter()))
+        {
+            objectsOfClass.insert
+            (
+                iter()->name(),
+                dynamic_cast<const Type*>(iter())
+            );
+        }
+        else if (isA<Type>(*iter()))
         {
             objectsOfClass.insert
             (