Updated wrapper blocks signature.
Solved performance issues.
Various bugfixes.