Updating constructor variables to be directly on the model