Updated to be in line with scanner version