removed ec_* fields, won't be provided by datasource entity registries
added javax.persistance annotations
Work in progress