CLDIDE-2082 Used objects from api-vfs instead objects from api-factory