Added argument classes