Additional data abstractions for future needs
Repackage