Updated for Team City 8.0