minor model updates to reflect other EP options
Merge pull request #2 from zinic/master

Minor Model Update