optimise annotation feature