Updates to address memory and performance issues, as well as reduce serialization footprint