Refactored OSBURIMapper