Added minor changes to data models