Add null check to Transformer
Add is_deleted attribute