Updates for form tool and tracking