Add some changes in classes of package entities