vNext - added regional settings, minor refactorings