Added support for external linking