Make prefix a struct, not a simple string