SerializableM -> SerializeM and related updates