refactoring of mapping - start
refactoring of mapping