added some more cross reference support