Added focus state support