FormEngine class updated