PR for code review

As required I removed the 'm' po for the getters and the setters of the Models.