Identity is now a function of state (and parameters of Entity have changed order)