Enhancements as requested by Svitlana