States on API changes v2