Updated data scheme