Updated examples and api