Improved regexp