Improved assets related logic.