Added argument handling code