Models: Updated models as per req. changes.