Adding filter and include parameter support