Updated queries and methods in line with changing how modules are used