Changes from PR
* Addition of new encountertype for HEI completion
* Removal of redundant fields
* Accessing the right packages
* Few edits from the forms