More serialization work + metadatable events