cleanups/add model adaptor