Now getting all data with one call - see commit 2771fff