Added argument handling