Serialization Update

Buffer removed for serialization