adding some special logic to handle raven identifiers