Adding singleton classes