removed temporary fixes to add in new module session field