Adds TeamInterface for Mappers and adds some mapper and model logic