Just one more abstraction layer will fix it.