Added initial form handling