Switched a few commands to the new general parser
Switching from static commands