Refactoring of link objects + support for Link.image and Link.file link types