Backend lib improvements