Removed public fields, replaced with getters/setters