Fully moved into using unsafe diStorm interface