Added ability to recognise arguments within commands