Annotation Tools: Removed unnecessary class and worked with element object