Added state variables