Made source and target optional during buildout