Updated to include assets