Updates for documentation, namespacing