Same comment as for the other variant above. And I guess there's little way to avoid duplicating this class in both places..?