Entity type is no longer dumb