phko: small changes in mapping concepts
solve conflict