Revert to single classes