REPORT-464: Added more handlers