add forward references consistently