Making things more generic.