replaced EntityRef and ActivityRef by IDRef