includeResources option. Updating TODOs