Modify schema design on recommendation of @TehShrike