Added a new toolkit class for easier versioning