Deprecated class and annotation change