Removed public fields, Added getters