Fixed namespaces. Added validation.