Changed the parameters for the mapping