Added namespace for sub-components