Rapids enhancements