Add RegExp support