Refactoring of Configuration - Fix for NCrunch