Add Computer and Switch models
Update Scheduler