Code formating and added AnnotationsInterface