Updated for assets