These should be class extensions, not categories