Refactored Team and Venue tables