Get rid of constants - make them configuration values