Checks added, prepared for the target suite version.