Improving the asset handling