Added arguments support