Assets refactoring