Some more changes in the state get object