Asset refactoring + bug fix.