This commit adds a more advanced command handler.