Added collection2 and autoform packages.