Updated schema for #20