Move APC to an attribute

Rather than default.