refined annotations for 0.17