Minor changes to wrapper