Add Handling to COA API