Modifying CLI for server build