moved mapping mechanism to content mapper