Made the changes to support Version formatting