Changed class namespace