Change script to use wrapper