Add trim-enabler
Refactor