renamed parsers and added attributes