Moved a couple more constants to Configuration class