add Getters and Setters, replace arrays to List and Set