Updates to synchronize with State API changes