AnnotatedObjectTransformer improvements