Extended omdel to include additional core objects.