Update for new version + removed functions