Added ability to support external dependencies