Some changes to make examples more easy to use