Added more visualisation components