Partial expandState implementation