Fixed namespace for auto loading