Merge "Add generic arguments"