Moved to using conf. instead of global constants from config.h