Refactor ModuleDAOImpl