more modules, record dirty tracking