Re-work version map to work with f21+