Fixed handling namespace as Class