correct wrapper model + use is_same_metadata
rebuild