Added traceur support