Added simplified wrapping script