Added bundler and rack support