Moved Type Mappers on package up