Improved configuration, removed dependency on minefield-cmn