Refactor with normalized schema; WIP