removed placeholder entity class
added additional members