Updates to models and management