Move into PSR structure?