Added better version support