Updates to sync with State API changes