Adding state checks