Refactor including collections getters and setters