Let bundler do more of the heavy lifting