Switched to the IoC container logic instead of the static class