Added the component mapper - WIP