Setting up framework for improved mapper