[216] Improve fields