Added class annotations