Added configuration manager