Adding more closure to AutoFocus Lists