DO NOT MERGE YET: Map listener interfaces redefined to use MapListener interface