Removed 'Core' from the namespace