Several enhancements