Adding unique arguments support