Added forms to config instead of forms module
Changes from plugins module