Switch to dictionary for scheme storage