Updated class, interface and trait checks