added annotatable and identifiable classes