Added general arguments