Stop using deprecated includes with with_items