@timgraham I moved this piece of code (that made the generic method depend on contrib) here since I think is an admin particular issue and should be solved here. Do you think this is better?