Exposed instance fields and added getters/setters