Merge pull request #2 from am11/master

Models: Updated models as per req. changes