Final fix mapping for org