Fix Server#add + Fluent interface for Server