Added ConfigurationHandler
End of Episode 6