Modified commands structure