[FEATURE] additional fields and parser improvement