Added ListAdapter support