singleton_class instead of (class << self...)