Added NRT support
Misc cleaning
Fixed missing deps