+ RClass Annotation and better guessing