Begin to make the package more template-agnostic