Added commandBox mapping