improved module tasks