Refactoring of asset handling to much a class