Reorganizing the handlers to match current api