Moved mapping to its own file