work on annotation support - fix & refactor index annotation generation