Updated various models and controllers