Should these changes be in v2?