Added tracking of version