Improvements. ETEENA-599