removed dependency on bean wrapper