Edits to models and controllers