Commands strctured / plugin corrected