Added focus policy and tab index support