Simplify entity table a little