API modifications. Also the examples in consequence