Working on identfiers + add regexes