Missing Serializable implementation
Fixed TM in use