Refactor classifier selection to use hash, more extensible