Add tr1 support