Use new abstraction layer