[IMP] Improve fields