[WIP] Fix PropertyStream overloads