Added default BPI field mappings