Starting next version, data-structures based.