Updates to models for System Management