Added support for link creation