add regex for handling identifiers with spaces