Added the ability to specify datastore type and version.