Add @id to model entities