Extend annotation correclty