Added support for multiple annotation member types