UC-53 Added config object to make injection easier and changes more managable.