Added arguments for filtering and format control