Framework enhancements