Added serializer registry and cleaned source