Now handling build number and version