Tweaked database design