Updated configuration_helper due to changes of types location