*Corrected model property names