[LOGTOOL-70] Split the annotations out