Tweak and document common class usage