FE DataAdapter refactored