Updating base module for new framework changes