Replaced TARGET_TYPE and ORIGINATOR_TYPE with CUSTOMER_TYPE