Improvements in the following methods
f.wrap, f.create
Part of the framework covered with unit tests