Enhance fields