Moves template expander to RestUtils