[ENGINE-6: changes related to new api]