Examples enhancements