Added code for UT to be auto wired