Changed some models

Changed some models