Added Annotations to various classes