Replaced Flags with arguments for commands