Added missing args and inputs