Entities added and modified. Long id changed to int for working purpuses