Updating to new controller schema.