Add support JSR330 scoping #3