Final work for detecting the current "solution mode"
Updating buildsupport