Updated state to better fit with JSON schema