Added Id for entities. Corrected metods.