Brings examples up to current API design