Store annotations in the Java model and convert them back
8 files changed