Rounding out the initial schema design.