changes due to modified entity backend