adjust for new ML-Framework design