Start refactor map step.
Added function for creating mappings.