Finished adding const expressions to model classes