[core] Improved lifetime