Better dependencies and add bundler compatibility