RegEx update to handle quotes