Renamed callbacks and made New POI exit on submit