Fixed the namespaces and added new mappers