Added user argument functionality