Got maps to work properly