[IMP] Improve result management