Pointers from old location of state classes
Add missing val
Merge pull request #449 from twitter/feature/state_deprecated_ptrs

Feature/state deprecated ptrs