Adding namespace support to form fields