Improved regex. Added class operator