Added namespaces. Updated documentation