Added support for list states