Add focus tracking