Custom serialization replaced with Binary module