Add mappings for ack and remove colliding ones