Fixed issue #11 - no need to wrap the class, only to add the model