Reworking stuff for dotnetConf