Made changes to models