Merge "Use Config instead of globals"