Improve regex to support unicode characters