Refactored the namespacing for CustomAttributes