addded some mappings to domain classes