Added Annotation code, and few tweaks