Simplified serialization in common project. Rest not adjusted