added support for using links