Change custom content handlers from list to dictionary