Simplify a spec
Add detail_server support