Added argument functionality