Scrap custom serialization, use yaml