Migrated to Vector, added explicit focus mgmt