Improve regexp for validation