Fixed the class mapper.