More consistent annotations