Refactor CMD to match standard from other classes