added parsing of extra info