Added optional/packaged/internal dependency support