Add field setters and getters