Refactor: optimize for assets pipeline