Fixed and implemented missing setters/getters