Make function data inclusion optional