Rely on better abstractions