Updated to use config.h