better version mapping & default value setting