Merged: Add config singleton