Mainly some more annotations for codegen