macros, cypher serialization updates