Add Moonshot-COI and Moonshot-APC attributes