Changed regex and string injection in simulator