Added entity id