More work toward make it work with jsr356