Updated a few changes
Updated the parser for cpe-\d fields