More annotations and collections support.