Set fields support added