Use class list with fixing wrong cases.

@anutron @cpojer @fakedarren