PM-753: updated Regex class