Updated to include global in addition to per-project settings