Implement all new methods for TM2