DB Schema gets some more work