Added machine learning support