Improving the transformers and validation checks