Update datamapper methods to collect real team data