Enhancements #531