Added search for both open/closed classes