Added new types of forms to demo