Update code and examples