Adding enhancements