Switch to dict for link element parsing