Changes to add the last map