Add MSlive support