Added vjax annotation copy, and @GenericCollectionType handling