Adding limit and formID support