NOREF: Fixing how and when the base class is called, making the structure of the manifests consistent