Babel enhancements