ACP Module improvements