Updated with changes for moving into main serialization package