Improve RegExp support