Updated Models to reflect DB changes