Some RegEx added