Added basic support for form collections