CLI datastore component complete (First release)