Add resolve handlers and general cleanup