Added more transformers to avoid most use of reflection