Seperated the handlers based on functionality