Add id into some entities