Modified Context implementation to use the new configuration system