Improve link schema