OnResolved updated implementation