Added way to deal with annotations