added simpleton class support