refactored field adapter + few improvements