#187 Introducing Constants in the mapping

I based this solution on #157