Added argument handling.