Feature/adapt to V3