dotj-11 APT annotations adding extra features to 1.8