FVA refactoring