Implement new classification workflow #26