Server commands implementation
Merge conflicts