Templates updated to use our base module