Updates to the API for exmaples and the Wrapper itself