Updated FormInstance api and Fields api.