fix field mappings
add dependency
fix batch operation