More custom events and preparation for map loading