Assets creation refactoring.
Fret refactoring