updates to streamline serialization