Add empty class support