Changes to Observable FSW.
Move serialization from extension to own class