change the command service to be singleton