updates to models and managers