Update version identification
Update types