using new getNextIdentifier function
Merge pull request #43 from willtp87/7.x

using new getNextIdentifier function