Enhanced the examples