Fixed to include correct fields in scan and scanInfo data structures