Adding enhancements for waiton