Made custom config classes and handlers.
Merge origin/master