Revamp crossreferences