More changes to allow annotations