additions to CommandHandler