Update config to use constants and update other files to make use of these changes