Updated with the handlers