Added argument handling boilerplate