After Liad refactoring