Modified Team, added Helpers and ViewModels