Hide fields support added