added Id to entities