Readd those classes. They're actually rather useful.