Porting more annotations classes [ci skip]