BuildBundle: enable species agnostic mapping (basic support)