Key update optimized