Upgrade to Wrapper 1.7, fixed deprecation and compatibility issues. Improved tasks by significant refactoring.