[SD-945] Improvements and missing files

Need to merge client code as well.