Moved out handlers from the core module to a module of their own