implicitly look for v2, add state_message, remove v1 keys