Update to Serialization

Working on some changes to serialization to make it easier for devs to
do it without providing customization steps.