Update to support list command