app_map is now in its own module