Added functionality to allow specific models and namespaces