Added derived state computer