Updated original schema objects, packaging