Started working on schema redesign.