General enhancements