move annotation creation to model save function