added analysis to source / fixed workspace schemes