More pythonic collections
Add fallback
Add tests for classifier
Add tests for models