NGII-1051 - Improvements