Trying to separate meta from payload
Fixed some bugs to allow streaming