Server CLI updated