Added classes and worked on annotations.