More work towards jsr356 support