Add option to return an array instead of a link