Added multiple enhancements