Add support for @resource/id's