Everything except CommandHandler should be all set