Bringing state dimensions work to API branch