Improvements on annotation tools