Support for generic states added.