Added external dependency support