Enhance fields boolean/states