Server: less DI, integrate the spec