Adding hacky support for links-array