Update regexp for better detection