Added annotations support via tooltips