Updated abstraction to survive latest master changes.