isCritical property moved to Entity