Improved serve command