Just on a quick look I have to say I'm confused by the format of your property file. Changing of its format would provide for much greater flexibility and available coding options. Is the property file form able to be changed?