Converted Config to ConfigHandler

Refactoring work