HV-721

Not 100% sure if I like the fact that we had to change the annotation processing setup. WDYT?