Updating models to new mutators/getters