Updated dependencies and virtualenv solution