Corected parsing methods and type regex