Updating scatter to support KF5