Updates to Refine Module code improvements