update add on module to adopt the new way of adding forms and encounter
adopted the new way of adding forms and encounters