Add regular expression for better output