Move post serialize to serparate module