Improved the code to recognise constants. This will allow for the generation of more specific policy files.