Changed state fetch to return all states - allow client more control