Added headers and changed configuration manager load method