Added in setters and getters