Manager API rewritten into Module API