Updated with the enhancements topics