Changes to configuration. Added more logging