FEATURE - add associated_id and associated_type