Changed constants to config options