Made Config future compatible