Add map-notify and move constants to a separate file
Clean up imports