Made some updates to the mapping