Added visualization support