Watsi model objects refactored
v2 Models after removing parse dependencies from model