Added CBU to command handler