Count and streaming api additions