added some model definitions
commiting after merge with origin