Serializators refactor