Also support the state field