Updated is_<class> to include with_id check