Small changes to map