Added additional model logic