Enhancements #544