Added more custom RegExp