DDBAAS-139:
               Corrections and further development