Update to handle focus/blur events