Added argument parsing to capabilities