More abstraction/inheritance, but running into some table inheritance problems.