Modified to fix DWR rename issue, permits blank identifiers now