Added externally visible state vars