Assets refactored