After this will follow a major version bump, removing fields deprecated in v5