Improve annotation types handling

Change text annotation type