Make attribution handler more generic