moved mappings to new comp model