Added Handler class for better DI and abstraction of concern to implement IDisposable instead of all-static methods.