modify for swapi restruct