Use singleton_class for readability