Add asset handling