[IMP] Improve performance