Add focus management