Can you bump up the language level to 1.7 in both cases for reasons of annotations support?