Revert "Revert "all Classes""

This reverts commit edd927a666159517f4bd686787b7c57210b30a55.