Move resource-id references to annotations