Reverted IDK how. Mistaken revert. Revert "Revert "Empty classes for return. Schema defined.""

This reverts commit 1cedae12a1ae1e4e2e6be080932d2f366a23bbbb.