moved id field from base data entity