Added fields with setters and getters