added state support