Feature/large trace support