Separate Mapping into Classes