Make nesta asset handling configurable
Some code cleanup
More code cleanup