Added support for annotated packages