Refactoring classes to fetch original names and adding missing Annotation File loader