Updated attributes to be contained within its own namespace