Refactored transforms to use model options