Add raw version of data structure scheme