[SD-945] Improvements and missing files