Use more sofisticated regex