Add public fields handling