more changes to make generic mappings for the rest stuff