Updated transformers to avoid having to check values directly within them. Moved that stuff to the model.