Add form capturing