Made some changes to models