Lots of changes to work with Visualiser