Add link field, issue 16