Improved regex to capture more challenges