Revert "Revert "APC Module""

This reverts commit d9ac667db251f5b79b261af52a732186a4daafb0.