Yes both are included, be sure to select "2005-2007 WITH oil cooler" from the option menu.