Updated some models to assign code to getters and setters