Merge "Add missing entries for input and output flags"