Basic annotation handling as been added.