Refactoring for next release to include better exception information
Updated versions