Don't forget the commandexecutor.
Fixes DBO-3