Add a top-level wrapper to the public structs