Refactor, added venues requests