Additions to house final products and to support final classes