Minor tweak
More updates for booby serializer