Add various enhancements