Did some enhancements for examples