Modified models and added Ipaddr and Switch models