[TASK] Always include "id" in resource data