Adding support for resource-code tags