Merged with Jackson's tm code