Added enhancements