[WIP] PropertyStream v2