Updated to support arrays in links