Simplified the namespace