Form management updates