Changed the modules so that they only create the default instances when needed.