Added module to data views plus more logging