Merge: improved loader and nitls