Modify so we have just one property file with just the values we need