Changed NAMESPACE with default export pattern