Minor changes to structure and updates to Wrapper