Changed references to map