Annotations ojbect added; refactoring