Init with NONE only where needed