Corrected model for handler