Added additional dependencies and selective visualization.