Updates and changes to scannotation