Better support for ts and ce